From 1402632d8c0b8eb31fb1c4870478cfe869dbe393 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 16 Jan 2022 10:30:18 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 525525 -> 526244 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index c68c46ed67b..009c3bdff2d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -860,7 +860,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index d62812804d1445ec009f115b58e0858d7fefd032..964c5578f7e41cf81c9a871425408c285585ce35 100644
GIT binary patch
delta 625
zcmccGsj#G9p<xT-?-X7x1t5sdN-RrE$xoiVp+rmqECLqQ)h*8~$<T#LPXC|GD8&xr
zD5Nl|vv>iuP4`J*ROW;VE2K=W`zXfY@8YchlarjjA%#(My5Iyx#p$|Xj6!e|ZYDFT
z$%8G6)zN`C17ux1)F|7^)Z*CoHz|xj%ml>D+ux+H{1F#S%}Y$mNsZ4>$yQQOv{lH<
zpT2exi`MkB7g#x_^Bb{oO^=Ubk(j>!GaK)8lR6eLnbe%(R4&fUG=-AX;t~ZV6=XXm
zFBFuSo>t3ZJbh{{i^=3$!aURSs#v(D->zkmnH(U>GW~lki~RJe&5SbBc~V&Trdt3F
zoZg+wDm>l6jfHo5W*v+8^a~T1#HRPvu^3Ko&t(+{NpMWxuz^Jrtp7n4kXM%pRLfD%
zVle%|Hb#!=7WFKO)1{M{#is{EFtbcgsb?{q93UVv-QXn)%jA2)9Md1<v#?EHUC&}Z
z{e1yY`=fdm$$C(HfIwO%7pDTmOPmU&dBv$E3SN$3jxPSrKyjcXR1H`Kh>fZQsKC)V
zJ~-4VI79=g%`@2D3#eO@3lT!7GD-@z3QE(LS2GDI5j0G5djBF8rFP#279eH?Vz%wR
I4eT8)01|k|V*mgE

delta 239
zcmZ3|uW+?fp<xT-@09jAX^cS31jNkS=cKW`6`#JlfJJ5c2R}BB=@WLcb4^QNk(eG|
z%_2Dce;teX<Qf@{>7Mm0#?vLzfZ{XiK|~@u@AQN9EQ-_hnpoJUzXgf?n#3eBUB`xn
zYr1v=i`4Y&8Yc1SIW;UC(=!`bgr_HPG4oB|pT@#AeMSR|_ViOVES}R<8d(e=1|&BE
zb=-N)&OLoWHVe!2IgKp3)2}XO7nuICk;N9IL~{CdMK*p8FUK%P7k_8X>HSSW4Mk0C
aLeuR_+4<XLnpuFD6^Plk%QUlhv;Y9GS5pW8

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 6477ad71e8c..c23343a027e 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3..0d5fca58d2c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 0ffc004d871..8062fce1e48 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2